From fa5685207c8154381186f328cd7b96ace04de7ee Mon Sep 17 00:00:00 2001
From: Ian Jackson <Ian.Jackson@eu.citrix.com>
Date: Tue, 29 Jun 2010 16:21:20 +0100
Subject: [PATCH] tools/xend: Revert 21541:7ff0e885b5c3 "a few blktap2 fixes"

Following discussion on xen-devel.  This changeset is doubtful and in
any case incomplete.
---
 tools/python/xen/util/blkif.py          |  2 +-
 tools/python/xen/xend/XendBootloader.py | 13 ++++---------
 tools/python/xen/xend/XendDomainInfo.py |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/tools/python/xen/util/blkif.py b/tools/python/xen/util/blkif.py
index ca5a3081b5..cbe76b613f 100644
--- a/tools/python/xen/util/blkif.py
+++ b/tools/python/xen/util/blkif.py
@@ -87,7 +87,7 @@ def _parse_uname(uname):
                 fn = "/dev/%s" %(fn,)
                
         if typ in ("tap", "tap2"):
-            (taptype, fn) = fn.split(":", 2)[1:3]
+            (taptype, fn) = fn.split(":", 1)
     return (fn, taptype)
 
 def blkdev_uname_to_file(uname):
diff --git a/tools/python/xen/xend/XendBootloader.py b/tools/python/xen/xend/XendBootloader.py
index 3824d5ac17..0cef917358 100644
--- a/tools/python/xen/xend/XendBootloader.py
+++ b/tools/python/xen/xend/XendBootloader.py
@@ -38,15 +38,10 @@ def bootloader(blexec, disk, dom, quiet = False, blargs = '', kernel = '',
         msg = "Bootloader isn't executable"
         log.error(msg)
         raise VmError(msg)
-    attempt = 0
-    while True:
-        if not os.access(disk, os.R_OK) and attempt > 3:
-            msg = "Disk isn't accessible"
-            log.error(msg)
-            raise VmError(msg)
-        else:
-            break
-        attempt = attempt + 1
+    if not os.access(disk, os.R_OK):
+        msg = "Disk isn't accessible"
+        log.error(msg)
+        raise VmError(msg)
 
     if os.uname()[0] == "NetBSD" and disk.startswith('/dev/'):
        disk = disk.replace("/dev/", "/dev/r")
diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 5a8d71a718..831506b9d9 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -3287,7 +3287,7 @@ class XendDomainInfo:
                     log.info("Unmounting %s from %s." %
                              (fn, BOOTLOADER_LOOPBACK_DEVICE))
 
-                    dom0.destroyDevice(devtype, BOOTLOADER_LOOPBACK_DEVICE, force = True)
+                    dom0.destroyDevice('tap', BOOTLOADER_LOOPBACK_DEVICE)
 
             if blcfg is None:
                 msg = "Had a bootloader specified, but can't find disk"
-- 
2.30.2